Handle invalid fontnames better. (#315187, Ed Catmur)

2005-09-09  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkfontbutton.c (gtk_font_button_update_font_info): Handle
	invalid fontnames better.  (#315187, Ed Catmur)

diff --git a/ChangeLog b/ChangeLog
index 544a636256fa06708c87f0dfa2840f8989336b60..6a763ff79dc8ed5a401fc529b199e943f5130028 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-2005-09-09  Matthias Clasen  <mclasen@redhat.com>
-
        * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle 
        invalid fontnames better. (#136926, Michael R. Walton)
        

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 544a636256fa06708c87f0dfa2840f8989336b60..6a763ff79dc8ed5a401fc529b199e943f5130028 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,3 @@
-2005-09-09  Matthias Clasen  <mclasen@redhat.com>
-
        * gtk/gtkfontsel.c (gtk_font_selection_set_font_name): Handle 
        invalid fontnames better. (#136926, Michael R. Walton)
        

diff --git a/gtk/gtkfontbutton.c b/gtk/gtkfontbutton.c
index c9cd587db3279e223886d10a1eac47f18bfe3528..d49c62d775c2c3bfa19253bc47d1962ba1e604a8 100644 (file)
--- a/gtk/gtkfontbutton.c
+++ b/gtk/gtkfontbutton.c
@@ -869,7 +869,7 @@ gtk_font_button_update_font_info (GtkFontButton *font_button)
 #endif
 
   style = NULL;
-  if (font_button->priv->show_style) 
+  if (font_button->priv->show_style && family) 
     {
       PangoFontFamily **families;
       PangoFontFace **faces;